composite.c (composition_update_it): Fix computing of cmp_it->width.

diff --git a/src/ChangeLog b/src/ChangeLog
index b58557a944e8871c9ece4d5964e54084ac426fc4..4e4f96786d9a2cdaf77d9b0b374577aa4a4d7d89 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Kenichi Handa  <handa@m17n.org>
+
+       * composite.c (composition_update_it): Fix computing of
+       cmp_it->width.
+
 2010-08-29  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L.

diff --git a/src/composite.c b/src/composite.c
index 233f9ac896999040884e7029c48b15301e302663..96474f43fabe2120b45908ab8217b5253fa6c4ac 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1440,8 +1440,7 @@ composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
        {
          c = XINT (LGSTRING_CHAR (gstring, i));
          cmp_it->nbytes += CHAR_BYTES (c);
-         cmp_it->width = (LGLYPH_WIDTH (glyph) > 0
-                          ? CHAR_WIDTH (LGLYPH_CHAR (glyph)) : 0);
+         cmp_it->width += LGLYPH_WIDTH (glyph) > 0 ? CHAR_WIDTH (c) : 0;
        }
     }
   return c;